projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02410e0 b37b5de)
bitkeeper revision 1.1159.212.88 (4203fbb5CoEmX_fzlXc90dxNw6gqoA)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Fri, 4 Feb 2005 22:48:21 +0000 (22:48 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Fri, 4 Feb 2005 22:48:21 +0000 (22:48 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bkX

1  2 
xen/arch/x86/setup.c patch | diff1 | diff2 | blob | history

diff --cc xen/arch/x86/setup.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.